Fix RTL keynav for going from menubar to menu.

2005-02-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL
	keynav for going from menubar to menu.

diff --git a/ChangeLog b/ChangeLog
index b336233c06dbcfbbfe38c191f2b099b6fed2dee9..4b6d11cb1ae89c555a99f2629d7b27cf11fc0a27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL
+       keynav for going from menubar to menu.
+
 2005-02-08  Christian Rose  <menthos@menthos.com>
 
        * configure.in: Added "xh" to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b336233c06dbcfbbfe38c191f2b099b6fed2dee9..4b6d11cb1ae89c555a99f2629d7b27cf11fc0a27 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-02-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL
+       keynav for going from menubar to menu.
+
 2005-02-08  Christian Rose  <menthos@menthos.com>
 
        * configure.in: Added "xh" to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b336233c06dbcfbbfe38c191f2b099b6fed2dee9..4b6d11cb1ae89c555a99f2629d7b27cf11fc0a27 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-02-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL
+       keynav for going from menubar to menu.
+
 2005-02-08  Christian Rose  <menthos@menthos.com>
 
        * configure.in: Added "xh" to ALL_LINGUAS.

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 2618cc48394dccd496f915b68c8929a715e24e7c..1c910476c237e20886d295fe702c86607b7e753c 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1097,10 +1097,12 @@ gtk_real_menu_shell_move_current (GtkMenuShell      *menu_shell,
       switch (direction) 
        {
        case GTK_MENU_DIR_PARENT:
-         direction = GTK_MENU_DIR_CHILD;
+         if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM)
+           direction = GTK_MENU_DIR_CHILD;
          break;
        case GTK_MENU_DIR_CHILD:
-         direction = GTK_MENU_DIR_PARENT;
+         if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM)
+           direction = GTK_MENU_DIR_PARENT;
          break;
        case GTK_MENU_DIR_PREV:
          if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)